we must not use QFile::remove that may fail on windows read-only files
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Fri, 4 Apr 2025 14:33:56 +0000 (16:33 +0200)
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>
Mon, 7 Apr 2025 10:53:38 +0000 (10:53 +0000)
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
src/gui/conflictsolver.cpp

index 780e4087b1dd4b77912c62cc106f0f26e5dd78c6..5292d48e3280e482b6bff5d0df7ebc56f969b1b0 100644 (file)
@@ -95,7 +95,7 @@ bool ConflictSolver::deleteLocalVersion()
     if (FileSystem::isDir(_localVersionFilename)) {
         return FileSystem::removeRecursively(_localVersionFilename);
     } else {
-        return QFile(_localVersionFilename).remove();
+        return FileSystem::remove(_localVersionFilename);
     }
 }